(smerge-resolve): Pass args to smerge-remove-props.

diff --git a/lisp/smerge-mode.el b/lisp/smerge-mode.el
index 4b677edc36a8db497bdd51a48b20dcb722b50733..31c7c4f2f1272a4c92bc9a49aa3e9dec20b4c7b0 100644 (file)
--- a/lisp/smerge-mode.el
+++ b/lisp/smerge-mode.el
@@ -372,7 +372,7 @@ This relies on mode-specific knowledge and thus only works in
 some major modes.  Uses `smerge-resolve-function' to do the actual work."
   (interactive)
   (smerge-match-conflict)
-  (smerge-remove-props)
+  (smerge-remove-props (match-beginning 0) (match-end 0))
   (cond
    ;; Trivial diff3 -A non-conflicts.
    ((and (eq (match-end 1) (match-end 3))